From 310a9300cc535070310261823b6c9a6774ac35fe Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Thu, 20 Sep 2018 22:43:47 +0100
Subject: [PATCH] no-openssl

don't add -lssl etc if not needed (because we use system-postgresql)


Gbp-Pq: Name no-openssl.diff
---
 RepositoryExternal.mk                        |  72 +------------------
 config_host.mk.in                            |   4 --
 configure.ac                                 | Bin 461529 -> 458980 bytes
 connectivity/Library_postgresql-sdbc-impl.mk |   1 -
 external/Module_external.mk                  |   1 -
 oox/CppunitTest_oox_tokenmap.mk              |   9 ---
 oox/Library_oox.mk                           |   9 ---
 ucb/CppunitTest_ucb_webdav_local_neon.mk     |   1 -
 ucb/CppunitTest_ucb_webdav_neon_opts.mk      |   1 -
 ucb/CppunitTest_ucb_webdav_propfindcache.mk  |   1 -
 ucb/CppunitTest_ucb_webdav_res_access.mk     |   1 -
 ucb/Library_ucpdav1.mk                       |   2 -
 12 files changed, 2 insertions(+), 100 deletions(-)

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index ca2d0da9948..46e895a7cb2 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1545,75 +1545,6 @@ endef
 
 endif # SYSTEM_HARFBUZZ
 
-ifeq ($(DISABLE_OPENSSL),TRUE)
-
-gb_ExternalProject__use_openssl:=
-gb_LinkTarget__use_openssl_headers:=
-gb_LinkTarget__use_openssl:=
-
-else # !DISABLE_OPENSSL
-
-ifneq ($(SYSTEM_OPENSSL),)
-
-gb_LinkTarget__use_openssl_headers:=
-gb_ExternalProject__use_openssl:=
-
-define gb_LinkTarget__use_openssl
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-	$(OPENSSL_CFLAGS) \
-)
-$(call gb_LinkTarget_add_libs,$(1),$(OPENSSL_LIBS))
-
-endef
-
-else # !SYSTEM_OPENSSL
-
-$(eval $(call gb_Helper_register_packages_for_install,ooo, \
-	openssl \
-))
-
-define gb_ExternalProject__use_openssl
-$(call gb_ExternalProject_use_package,$(1),openssl)
-
-endef
-
-define gb_LinkTarget__use_openssl_headers
-$(call gb_LinkTarget_use_external_project,$(1),openssl)
-$(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,openssl)/include \
-	$$(INCLUDE) \
-)
-
-endef
-
-define gb_LinkTarget__use_openssl
-$(call gb_LinkTarget_use_package,$(1),openssl)
-ifeq ($(OS),WNT)
-$(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,openssl)/out32dll/ssleay32.lib \
-	$(call gb_UnpackedTarball_get_dir,openssl)/out32dll/libeay32.lib \
-)
-else
-$(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,openssl)/libssl.a \
-	$(call gb_UnpackedTarball_get_dir,openssl)/libcrypto.a \
-)
-$(call gb_LinkTarget_use_external_project,$(1),openssl)
-ifeq ($(OS),SOLARIS)
-$(call gb_LinkTarget_add_libs,$(1),\
-	-lnsl \
-	-lsocket \
-)
-endif
-endif
-
-endef
-
-endif # SYSTEM_OPENSSL
-endif # DISABLE_OPENSSL
-
-
 ifeq ($(DISABLE_OPENSSL),TRUE)
 
 define gb_LinkTarget__use_gnutls
@@ -3092,9 +3023,10 @@ $(call gb_LinkTarget_add_libs,$(1),\
 	$(call gb_UnpackedTarball_get_dir,postgresql)/src/interfaces/libpq/libpq$(gb_StaticLibrary_PLAINEXT) \
 )
 
-ifeq ($(OS),WNT)
 $(call gb_LinkTarget_use_external,$(1),openssl)
 
+ifeq ($(OS),WNT)
+
 $(call gb_LinkTarget_use_system_win32_libs,$(1),\
 	secur32 \
 	ws2_32 \
diff --git a/config_host.mk.in b/config_host.mk.in
index da8d69de0fb..aa9bfb57633 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -100,7 +100,6 @@ export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@
 export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@
 export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@
 export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@
-export DISABLE_OPENSSL=@DISABLE_OPENSSL@
 export DISABLE_PYTHON=@DISABLE_PYTHON@
 export DLOPEN_LIBS=@DLOPEN_LIBS@
 export DLLTOOL=@DLLTOOL@
@@ -434,8 +433,6 @@ export OFFICEOTRON=@OFFICEOTRON@
 export BFFVALIDATOR=@BFFVALIDATOR@
 export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@
 export OOO_VENDOR=@OOO_VENDOR@
-export OPENSSL_CFLAGS=$(gb_SPACE)@OPENSSL_CFLAGS@
-export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@
 export OPENSYMBOL_TTF=@OPENSYMBOL_TTF@
 export ORCUS_CFLAGS=$(gb_SPACE)@ORCUS_CFLAGS@
 export ORCUS_LIBS=$(gb_SPACE)@ORCUS_LIBS@
@@ -573,7 +570,6 @@ export SYSTEM_NSS=@SYSTEM_NSS@
 export SYSTEM_ODBC_HEADERS=@SYSTEM_ODBC_HEADERS@
 export SYSTEM_ODFGEN=@SYSTEM_ODFGEN@
 export SYSTEM_OPENLDAP=@SYSTEM_OPENLDAP@
-export SYSTEM_OPENSSL=@SYSTEM_OPENSSL@
 export SYSTEM_PAGEMAKER=@SYSTEM_PAGEMAKER@
 export SYSTEM_POPPLER=@SYSTEM_POPPLER@
 export SYSTEM_POSTGRESQL=@SYSTEM_POSTGRESQL@
diff --git a/configure.ac b/configure.ac
index 13362730ae72fa26a14de0a910d1d6acf873b543..e8ef251ae9d2961ee54e90c563d6e5768e244e81 100644
GIT binary patch
delta 34
qcmcaPRpv>fOhXG}3sVbo3(FSP4_edbaj<Z<zcXRo{?3H$^;H1yjSdh1

delta 1618
zcmcgsOKcle6qP+QPCF^IYW-=Tf>$RkZRq%e+?bFW)xWeBuI*$T@d?o|o_UU+I+^Fr
zjO99;q*5f<qNrTh(Jt8_B&4d9Sg`4?Y9#~`VuMt~+LeGE5^wCWtEPb^-i-C$z2}~L
z-aYrX8z+9gd18CVx8vX8cKC0F{w(w_auXA@jZND&cC%BZ!-bNZ&6SHvwN|Xiav5&T
z2_fj8@{2)Ys|^FADhp;8sAH?^7<@PULAd+6a0q_?+aLby>wpOD*SHBd{ug)ngA6LD
zR+pG)0XZ#fipcv-k3ooyblkSEraD+hT^58I9b)LjTt`i6p=2VKM(k^_dn@)70P>&v
zVhib1Vs1V)7w@)u60s$<-8Qf^!ebDU*O)|1X+zbhEhQ6DS~3VV2LP#bDt&%FnTi{v
zp;^7QL&w=zm*^l#Vp-Rp=7}QsB7AVtL(Z5~gkSFS(WrN@c5c;Ej{O^*ogEN|rLTnG
zVg)-nxe!GXMbR0B+EJ82(JIsQ`O|`>u2XZ-=ta?o<JMgXPoIV-kNM*qdo%d-hrkqw
z5q?r1QR-oP94)^u*Naz1kC~}2uN2339#18|Sk7LOGtZruOF20cl?+w|Nybp0-D}!0
zczmCK>E%&x`}7M-KLsK{bHWRw$%5o}{Ht)}3;t-t%R_dj-KLgfBl&XneDV$WUgm;O
zD+>YGt_LRJlM;6-G)+v+=;#<-@Ur4|OTGD!3k8QsO1}Oc(x~a+>&}7*UvBats2%bP
zAgu&KCr6bWN)a{m7^+}4V{d0rA~qj;Gq!fttr_v<!6)-4-8^w?&+rfR8VECux~gTe
zF;*R<8cvIL)?3d^@z5RmIb`>22X7!YQkH5FY@-de=MFhGbwo`>oB>`ouUwHYDeq>N
zD`!@#o~5>0s*M_$nLzj87-`BnWD;m}qfHFfK%<Asq)|m(Vi*kjDrQc^h&CBA^N#au
zeXqP`VP+siOr0>VIUXHsYK-67a5`08SGL?9UF!`7(lz=2OK5AzC@MCIC^CiQm7H8Z
zv%2S17-5k#k%MiASqPi%R#G(5ZedID-dt&@+EpgFYc6I7W|&d<9xOM&HN|j2fpSz3
zp!^Ldg1E^AL;GUF(k3^*`{+SvmYLrZ&o$+L5rIbue;7W}gcre_@gLlM_#h0|Zu4*X
zn*?tC$;}kldK^!a$9=H>EXRlsTZ^?=tzu=coAagG<>K<l)k-d#f2UX}z>@>~vGD#v
wz{LhP1>1LosqnufzjBX{!><?k1Cjj$*1*@}YH-BzAN;sKE8OYN2LAZ*AGY)iHvj+t

diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk
index 53cebd01a24..e18e6543e62 100644
--- a/connectivity/Library_postgresql-sdbc-impl.mk
+++ b/connectivity/Library_postgresql-sdbc-impl.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\
 	boost_headers \
 	postgresql \
 	$(if $(filter-out MSC,$(COM)), \
-		openssl \
 		openldap \
 		nss3 \
 		plc4 \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 33800e8147a..38bdbb19ea1 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -79,7 +79,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,NSS,nss) \
 	$(call gb_Helper_optional,ODFGEN,libodfgen) \
 	$(call gb_Helper_optional,OPENLDAP,openldap) \
-	$(call gb_Helper_optional,OPENSSL,openssl) \
 	$(call gb_Helper_optional,ORCUS,liborcus) \
 	$(call gb_Helper_optional,OWNCLOUD_ANDROID_LIB,owncloud-android-lib) \
 	$(call gb_Helper_optional,PAGEMAKER,libpagemaker) \
diff --git a/oox/CppunitTest_oox_tokenmap.mk b/oox/CppunitTest_oox_tokenmap.mk
index 8019da7a230..0c6ab952a81 100644
--- a/oox/CppunitTest_oox_tokenmap.mk
+++ b/oox/CppunitTest_oox_tokenmap.mk
@@ -20,19 +20,10 @@ $(eval $(call gb_CppunitTest_use_sdk_api,oox_tokenmap))
 
 $(eval $(call gb_CppunitTest_use_library_objects,oox_tokenmap,oox))
 
-ifeq ($(TLS),OPENSSL)
-$(eval $(call gb_CppunitTest_use_externals,oox_tokenmap,\
-	openssl \
-	openssl_headers \
-))
-else
-ifeq ($(TLS),NSS)
 $(eval $(call gb_CppunitTest_use_externals,oox_tokenmap,\
        plc4 \
        nss3 \
 ))
-endif
-endif
 
 $(eval $(call gb_CppunitTest_use_libraries,oox_tokenmap,\
     avmedia \
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index e917a9b866d..cb7ed4643bb 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -67,19 +67,10 @@ $(eval $(call gb_Library_use_externals,oox,\
 	boost_headers \
 ))
 
-ifeq ($(TLS),OPENSSL)
-$(eval $(call gb_Library_use_externals,oox,\
-	openssl \
-	openssl_headers \
-))
-else
-ifeq ($(TLS),NSS)
 $(eval $(call gb_Library_use_externals,oox,\
        plc4 \
        nss3 \
 ))
-endif
-endif
 
 $(eval $(call gb_Library_set_componentfile,oox,oox/util/oox))
 
diff --git a/ucb/CppunitTest_ucb_webdav_local_neon.mk b/ucb/CppunitTest_ucb_webdav_local_neon.mk
index 2e920f4ca03..a4ea2358d2f 100644
--- a/ucb/CppunitTest_ucb_webdav_local_neon.mk
+++ b/ucb/CppunitTest_ucb_webdav_local_neon.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_local_neon,\
 	boost_headers \
 	libxml2 \
 	neon \
-	openssl \
 ))
 
 $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_local_neon,\
diff --git a/ucb/CppunitTest_ucb_webdav_neon_opts.mk b/ucb/CppunitTest_ucb_webdav_neon_opts.mk
index df670ed7afd..020d9f9b6dd 100644
--- a/ucb/CppunitTest_ucb_webdav_neon_opts.mk
+++ b/ucb/CppunitTest_ucb_webdav_neon_opts.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_neon_opts,\
 	boost_headers \
 	libxml2 \
 	neon \
-	openssl \
 ))
 
 $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_neon_opts,\
diff --git a/ucb/CppunitTest_ucb_webdav_propfindcache.mk b/ucb/CppunitTest_ucb_webdav_propfindcache.mk
index 8d4a12d32ad..8504a0200ae 100644
--- a/ucb/CppunitTest_ucb_webdav_propfindcache.mk
+++ b/ucb/CppunitTest_ucb_webdav_propfindcache.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_propfindcache,\
 	boost_headers \
 	libxml2 \
 	neon \
-	openssl \
 ))
 
 $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_propfindcache,\
diff --git a/ucb/CppunitTest_ucb_webdav_res_access.mk b/ucb/CppunitTest_ucb_webdav_res_access.mk
index fa0669987bd..ad25d29f945 100644
--- a/ucb/CppunitTest_ucb_webdav_res_access.mk
+++ b/ucb/CppunitTest_ucb_webdav_res_access.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_res_access,\
 	boost_headers \
 	libxml2 \
 	neon \
-	openssl \
 ))
 
 $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_res_access,\
diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk
index c76489bd484..2496b80c769 100644
--- a/ucb/Library_ucpdav1.mk
+++ b/ucb/Library_ucpdav1.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_externals,ucpdav1,\
 	boost_headers \
 	libxml2 \
 	neon \
-	openssl \
 ))
 
 $(eval $(call gb_Library_use_custom_headers,ucpdav1,\
@@ -73,7 +72,6 @@ else # WITH_WEBDAV == serf
 $(eval $(call gb_Library_use_externals,ucpdav1,\
 	boost_headers \
 	apr \
-	openssl \
 	serf \
 	zlib \
 ))
-- 
2.30.2